Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 20 Apr 2013 08:01:06 +0000 (11:01 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 20 Apr 2013 08:01:06 +0000 (11:01 +0300)
commit426a91e16363f9d4484e5eb257e8a1ff52aa473a
tree34c4c689c661de23c1581beb3e4e239f94cc6597
parent480175c4cd035248a8e4924aa000723f9ec4b17b
parent484106340b060b50eade562c26dac73f32b988a2
Merge from trunk.